Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added the wired charger #172

Merged
merged 11 commits into from
Jul 25, 2023
Merged

Added the wired charger #172

merged 11 commits into from
Jul 25, 2023

Conversation

Trytoon
Copy link
Contributor

@Trytoon Trytoon commented Jun 29, 2023 •
edited
Loading

Description

Hey !
This is what I come up with for the Wired Charger !

I think that it just needs some balancing when calculating the amount of energy extracted while charging but we can discuss it here.

Fixes issue(s): #144

Todo

  • Fix the recipe
  • Fix blockstates

Checklist:

  • My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you)
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation

Rover656
Rover656 requested changes Jun 29, 2023
View reviewed changes
Copy link
Member

@Rover656 Rover656 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is looking really good! Very nicely done.

As for block models and states, I'll have a look at what to suggest for that when I return from work :)

src/machines/java/com/enderio/machines/common/blockentity/WiredChargerBlockEntity.java Outdated Show resolved Hide resolved
src/machines/java/com/enderio/machines/common/blockentity/WiredChargerBlockEntity.java Show resolved Hide resolved
src/machines/java/com/enderio/machines/common/blockentity/WiredChargerBlockEntity.java Outdated Show resolved Hide resolved
src/machines/java/com/enderio/machines/common/blockentity/WiredChargerBlockEntity.java Outdated Show resolved Hide resolved
src/machines/java/com/enderio/machines/common/blockentity/WiredChargerBlockEntity.java Outdated Show resolved Hide resolved
@Rover656 Rover656 added Type-Enhancement New feature or enhancement to existing feature. MC-1.20.1 Area-Parity 1.12.2 missing features labels Jun 29, 2023
@Rover656 Rover656 added this to the First Alpha Release (v6.0.0) milestone Jun 29, 2023
@Trytoon Trytoon requested a review from Rover656 July 11, 2023 13:39
Rover656
Rover656 requested changes Jul 11, 2023
View reviewed changes
Copy link
Member

@Rover656 Rover656 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is looking good so far functionally, not done code review yet but I've a couple things that you should look at (might need some help from chonky on the 2nd):

  1. The slots down the side should show your armor and offhand slots, might want to look at vanilla to see how to draw the template shapes if the slots are empty.
  2. Due to the unconventional framing of the GUI, the io config spills out over the edges of the visual space.

Other than these though, functionally this works great! Nice work!

@Rover656
Copy link
Member

CC @mystchonky for the above :)

@dphaldes
Copy link
Contributor

The fix for this should be pretty straightforward, I will create a small PR which should allow adding insets to renderer preview. Screens would be able to customize whatever size/shape they want.
Also @Trytoon I noticed that you are missing some datagen files in this PR. Run datagen and commit them :)

@dphaldes dphaldes mentioned this pull request Jul 12, 2023
Merged
5 tasks
@dphaldes
Copy link
Contributor

Now that #295 is merged, you can add insets and correctly size the ioconfig renderer. Add insets and pass it to constructor

var inset = new IOConfigButton.Inset(left,right, top, bottom);

@Trytoon Trytoon requested a review from Rover656 July 13, 2023 16:09
Rover656
Rover656 approved these changes Jul 25, 2023
View reviewed changes
Copy link
Member

@Rover656 Rover656 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm really happy with this; thanks a lot for your work on this!

@Rover656 Rover656 merged commit d4e5a70 into Team-EnderIO:dev/1.20.1 Jul 25, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Rover656 Rover656 Rover656 approved these changes

Assignees
No one assigned
Labels
Area-Parity 1.12.2 missing features MC-1.20.1 Type-Enhancement New feature or enhancement to existing feature.
Projects
None yet
Milestone
1.12.2 Parity Features
Development

Successfully merging this pull request may close these issues.
3 participants
@Trytoon @Rover656 @dphaldes